From 18918be607d1b824d336982ffc575c517c3d4ac0 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 25 Jun 2010 13:10:46 +0100 Subject: [PATCH] x86 cpu: use rdmsrl/wrmsrl Signed-off-by: Christoph Egger --- xen/arch/x86/cpu/centaur.c | 19 +++++++++---------- xen/arch/x86/cpu/common.c | 7 +++---- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c index a46e632bed..c3b2bf6f8c 100644 --- a/xen/arch/x86/cpu/centaur.c +++ b/xen/arch/x86/cpu/centaur.c @@ -17,7 +17,7 @@ static void __init init_c3(struct cpuinfo_x86 *c) { - u32 lo, hi; + uint64_t msr_content; /* Test for Centaur Extended Feature Flags presence */ if (cpuid_eax(0xC0000000) >= 0xC0000001) { @@ -25,17 +25,17 @@ static void __init init_c3(struct cpuinfo_x86 *c) /* enable ACE unit, if present and disabled */ if ((tmp & (ACE_PRESENT | ACE_ENABLED)) == ACE_PRESENT) { - rdmsr (MSR_VIA_FCR, lo, hi); - lo |= ACE_FCR; /* enable ACE unit */ - wrmsr (MSR_VIA_FCR, lo, hi); + rdmsrl(MSR_VIA_FCR, msr_content); + /* enable ACE unit */ + wrmsrl(MSR_VIA_FCR, msr_content | ACE_FCR); printk(KERN_INFO "CPU: Enabled ACE h/w crypto\n"); } /* enable RNG unit, if present and disabled */ if ((tmp & (RNG_PRESENT | RNG_ENABLED)) == RNG_PRESENT) { - rdmsr (MSR_VIA_RNG, lo, hi); - lo |= RNG_ENABLE; /* enable RNG unit */ - wrmsr (MSR_VIA_RNG, lo, hi); + rdmsrl(MSR_VIA_RNG, msr_content); + /* enable RNG unit */ + wrmsrl(MSR_VIA_RNG, msr_content | RNG_ENABLE); printk(KERN_INFO "CPU: Enabled h/w RNG\n"); } @@ -47,9 +47,8 @@ static void __init init_c3(struct cpuinfo_x86 *c) /* Cyrix III family needs CX8 & PGE explicity enabled. */ if (c->x86_model >=6 && c->x86_model <= 9) { - rdmsr (MSR_VIA_FCR, lo, hi); - lo |= (1<<1 | 1<<7); - wrmsr (MSR_VIA_FCR, lo, hi); + rdmsrl(MSR_VIA_FCR, msr_content); + wrmsrl(MSR_VIA_FCR, msr_content | (1ULL << 1 | 1ULL << 7)); set_bit(X86_FEATURE_CX8, c->x86_capability); } diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 0264023f4e..3899a54260 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -324,10 +324,9 @@ static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c) { if (cpu_has(c, X86_FEATURE_PN) && disable_x86_serial_nr ) { /* Disable processor serial number */ - unsigned long lo,hi; - rdmsr(MSR_IA32_BBL_CR_CTL,lo,hi); - lo |= 0x200000; - wrmsr(MSR_IA32_BBL_CR_CTL,lo,hi); + uint64_t msr_content; + rdmsrl(MSR_IA32_BBL_CR_CTL,msr_content); + wrmsrl(MSR_IA32_BBL_CR_CTL, msr_content | 0x200000); printk(KERN_NOTICE "CPU serial number disabled.\n"); clear_bit(X86_FEATURE_PN, c->x86_capability); -- 2.30.2